New upstream release

diff --git a/debian/changelog b/debian/changelog
index 6a3888b736860b674363de12ba44ed70d437e018..c70c6a4d72a7527fadb69d9bea1d7033399d63f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ostree (2017.9-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Drop backported patch
+    - Update symbols file
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 28 Jul 2017 12:00:20 +0100
+
 ostree (2017.8-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols
index 8d3b5601486b83d980f9d66bdf06b71d424aa0c9..84c8650595d88243d6734be2a60efa887e43781b 100644 (file)
--- a/debian/libostree-1-1.symbols
+++ b/debian/libostree-1-1.symbols
@@ -14,6 +14,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  LIBOSTREE_2017.6@LIBOSTREE_2017.6 2017.6
  LIBOSTREE_2017.7@LIBOSTREE_2017.7 2017.7
  LIBOSTREE_2017.8@LIBOSTREE_2017.8 2017.8
+ LIBOSTREE_2017.9@LIBOSTREE_2017.9 2017.9
  ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get@LIBOSTREE_2017.6 2017.6
  ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4

diff --git a/debian/patches/lib-commit-Fix-EBADF-with-GENERATE_SIZES-option-for-commi.patch b/debian/patches/lib-commit-Fix-EBADF-with-GENERATE_SIZES-option-for-commi.patch
deleted file mode 100644 (file)
index fcfa6f0..0000000
--- a/debian/patches/lib-commit-Fix-EBADF-with-GENERATE_SIZES-option-for-commi.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 19 Jul 2017 09:19:16 -0400
-Subject: lib/commit: Fix EBADF with GENERATE_SIZES option for commit
-
-Regression from previous tmpfile refactoring; unfortunately
-the `OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES` option
-only has coverage via gjs currently.
-
-Might expose it via the cmdline in a later option, but in the big picture the
-idea was that this data is better kept in static deltas.
-
-Bug: https://github.com/ostreedev/ostree/issues/1014
-Forwarded: https://github.com/ostreedev/ostree/pull/1016
----
- src/libostree/ostree-repo-commit.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
-index baeef3f..332f22a 100644
---- a/src/libostree/ostree-repo-commit.c
-+++ b/src/libostree/ostree-repo-commit.c
-@@ -733,6 +733,17 @@ write_content_object (OstreeRepo         *self,
-     }
-   else
-     {
-+      /* Update size metadata if configured */
-+      if (indexable && object_file_type == G_FILE_TYPE_REGULAR)
-+        {
-+          struct stat stbuf;
-+
-+          if (!glnx_fstat (tmpf.fd, &stbuf, error))
-+            return FALSE;
-+
-+          repo_store_size_entry (self, actual_checksum, unpacked_size, stbuf.st_size);
-+        }
-+
-       /* This path is for regular files */
-       if (!commit_loose_regfile_object (self, actual_checksum, &tmpf,
-                                         uid, gid, mode,
-@@ -742,17 +753,6 @@ write_content_object (OstreeRepo         *self,
-                                   ostree_object_type_to_string (OSTREE_OBJECT_TYPE_FILE));
-     }
- 
--  /* Update size metadata if configured */
--  if (indexable && object_file_type == G_FILE_TYPE_REGULAR)
--    {
--      struct stat stbuf;
--
--      if (!glnx_fstat (tmpf.fd, &stbuf, error))
--        return FALSE;
--
--      repo_store_size_entry (self, actual_checksum, unpacked_size, stbuf.st_size);
--    }
--
-   /* Update statistics */
-   g_mutex_lock (&self->txn_stats_lock);
-   self->txn_stats.content_objects_written++;

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 44ac8f7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-lib-commit-Fix-EBADF-with-GENERATE_SIZES-option-for-commi.patch